Consider all clojure sexps as defuns#32
Conversation
| (setq-local treesit-defun-tactic 'top-level) | ||
| (setq-local treesit-defun-type-regexp | ||
| (cons (rx (or "list_lit" "vec_lit" "map_lit")) | ||
| (cons (regexp-opt clojure-ts--sexp-nodes) |
There was a problem hiding this comment.
I'd add some note explaining this, so someone wouldn't fix down the road. :-)
|
I'm fine with the proposal as it's in line with how most Emacs modes work - defuns are essentially top-level forms in them, not real defuns. I'd suggest adding a couple of unit tests for this (you can copy something from |
|
@bbatsov thanks for the review! I added the note and the changelog entry. However, for the tests there is nothing set up yet here and I guess adding some bare-bone tests could conflict with @dannyfreeman's plan outlined in #25 (comment)? |
|
Well, I see those tests as accretive to the tests that we plan to copy, so I don't think that would create any issues. I'm guessing you can just copy all the tests, as this would help set up the infra here and this would actually speed up the compatibility work. But if you don't want to tackle this, I or Danny can do it down the road. |
|
@bbatsov I'd rather not tackle setting up the tests here and now, but would be happy to help Danny and you down the road. |
|
It might be clarifying for the issue title (and more importantly the changelog) if it said "top-level forms" (or even "top-level sexps"). I read the title and thought every (possibly-nested) sexp would be a target for (Please disregard entirely if I've misunderstood—I haven't run this.) Cheers. |
|
Yeah, that affects only top-level forms. I'll update the changelog. |
3 participants
Consider this clojure code,
|indicating the point positionWithout this change,
beginning-of-defunwould move point before the(defn foo,,,)as the symbol literalfoois not considered as a valid defun.With this change, all clojure sexps will be considered as defuns, so
beginning-of-defunmoves point beforefoo, which I would consider as the expected behavior.Similar for
cider-eval-defun-at-point: At the point position indicated in the example without this change the(defn bar,,,)form is evaluated. With this change,foois evaluated, which I also would consider the expected behavior.